Revision: baz--bug3090--0--patch-9
Archive: rob.weir@canonical.com--2004-public
Creator: Rob Weir <rob.weir@canonical.com>
Date: Tue Dec  7 04:24:26 EST 2004
Standard-date: 2004-12-06 17:24:26 GMT
New-files: commands/.arch-ids/tree-id.c.id
    commands/.arch-ids/tree-id.h.id commands/tree-id.c
    commands/tree-id.h libarch/merge-three-way.c
    libarch/merge-three-way.h po/.arch-ids/=id
    po/.arch-ids/LINGUAS.id po/.arch-ids/README.id
    po/.arch-ids/gettext.h.id po/.arch-ids/ja.po.id
    po/LINGUAS po/Makefile.in po/PLUGIN/.arch-ids/=id
    po/PLUGIN/.arch-ids/REQ.id po/PLUGIN/REQ po/README
    po/etc/.arch-ids/=id po/etc/.arch-ids/makepo.id
    po/etc/.arch-ids/memo.ja.id
    po/etc/.arch-ids/messages.pot.id po/etc/makepo
    po/etc/memo.ja po/etc/messages.pot po/gettext.h po/ja.po
    tests/.arch-ids/test-tree-id.sh.id
    tests/test-tree-id.sh
New-directories: po po/.arch-ids po/PLUGIN
    po/PLUGIN/.arch-ids po/etc po/etc/.arch-ids
Removed-files: commands/.arch-ids/cmd-changes.c.id
    commands/cmd-changes.c commands/cmd-changes.h
Renamed-files: tests/test-what-changed.sh tests/test-diff.sh
Modified-files: PLUGIN/options baz/Makefile.in baz/baz.c
    commands/cmd-abrowse.c commands/cmd-add-id.c
    commands/cmd-add-log-version.c
    commands/cmd-add-pristine.c
    commands/cmd-ancestry-graph.c commands/cmd-ancestry.c
    commands/cmd-apply-changeset.c
    commands/cmd-apply-delta.c commands/cmd-archive-fixup.c
    commands/cmd-archive-meta-info.c
    commands/cmd-archive-mirror.c
    commands/cmd-archive-setup.c
    commands/cmd-archive-snapshot.c
    commands/cmd-archive-version.c commands/cmd-archives.c
    commands/cmd-branch.c commands/cmd-branches.c
    commands/cmd-build-config.c commands/cmd-cachedrevs.c
    commands/cmd-cacherev.c commands/cmd-cat-archive-log.c
    commands/cmd-cat-config.c commands/cmd-cat-log.c
    commands/cmd-categories.c commands/cmd-changelog.c
    commands/cmd-changeset.c commands/cmd-commit.c
    commands/cmd-default-id.c commands/cmd-delete-id.c
    commands/cmd-delta.c commands/cmd-diff.c
    commands/cmd-diff.h commands/cmd-escape.c
    commands/cmd-file-diff.c commands/cmd-file-find.c
    commands/cmd-find-pristine.c
    commands/cmd-get-changeset.c commands/cmd-get.c
    commands/cmd-grab.c commands/cmd-help.c
    commands/cmd-id-tagging-defaults.c
    commands/cmd-id-tagging-method.c commands/cmd-id.c
    commands/cmd-import.c commands/cmd-init-tree.c
    commands/cmd-inventory.c commands/cmd-join-branch.c
    commands/cmd-library-add.c
    commands/cmd-library-archives.c
    commands/cmd-library-branches.c
    commands/cmd-library-categories.c
    commands/cmd-library-config.c
    commands/cmd-library-file.c commands/cmd-library-find.c
    commands/cmd-library-log.c
    commands/cmd-library-remove.c
    commands/cmd-library-revisions.c
    commands/cmd-library-versions.c
    commands/cmd-lock-pristine.c
    commands/cmd-lock-revision.c
    commands/cmd-log-for-merge.c
    commands/cmd-log-versions.c commands/cmd-logs.c
    commands/cmd-make-archive.c commands/cmd-make-branch.c
    commands/cmd-make-category.c commands/cmd-make-log.c
    commands/cmd-make-version.c commands/cmd-merges.c
    commands/cmd-missing.c commands/cmd-move-id.c
    commands/cmd-mv.c commands/cmd-my-default-archive.c
    commands/cmd-my-id.c commands/cmd-my-revision-library.c
    commands/cmd-new-merges.c
    commands/cmd-parse-package-name.c
    commands/cmd-pristines.c commands/cmd-rbrowse.c
    commands/cmd-redo.c commands/cmd-register-archive.c
    commands/cmd-remove-log-version.c commands/cmd-replay.c
    commands/cmd-revisions.c
    commands/cmd-set-tree-version.c
    commands/cmd-show-changeset.c commands/cmd-star-merge.c
    commands/cmd-switch.c commands/cmd-sync-tree.c
    commands/cmd-tree-root.c commands/cmd-tree-version.c
    commands/cmd-uncacherev.c commands/cmd-undo.c
    commands/cmd-update.c commands/cmd-valid-package-name.c
    commands/cmd-versions.c commands/cmd-whereis-archive.c
    commands/cmds.c commands/cmdutils.c commands/cmdutils.h
    commands/lint.c libarch/apply-changeset.c
    libarch/apply-changeset.h libarch/arbdelta.c
    libarch/build-revision.c libarch/changeset-report.c
    libarch/changeset-utils.c libarch/changeset-utils.h
    libarch/commit.c libarch/import.c libarch/inode-sig.c
    libarch/inode-sig.h libarch/inv-ids.c libarch/invent.c
    libarch/invent.h libarch/libraries.c
    libarch/library-txn.c libarch/make-changeset.c
    libarch/patch-logs.c libarch/patch-logs.h
    libarch/replay.c libarch/star-merge.c
    libarch/star-merge.h libarch/undo.c tests/Makefile.in
    tests/test-diff.sh tests/test-import.sh
    tests/test-mv-explicit-baz.sh tests/test-mv-explicit.sh
    tests/test-pristines.sh
Modified-directories: {arch}/baz/baz--makearchivefixprint
    {arch}/baz/baz--makearchivefixprint/baz--makearchivefixprint--1.1
    {arch}/baz/baz--makearchivefixprint/baz--makearchivefixprint--1.1/jblack@gnuarch.org--2004
    {arch}/baz/baz--makearchivefixprint/baz--makearchivefixprint--1.1/jblack@gnuarch.org--2004/patch-log
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-1
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-2
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-3
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-4
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-5
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-6
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-7
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-8
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-9
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-10
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-11
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-12
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-13
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-14
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-15
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-16
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-17
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-18
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-19
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-20
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-21
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-22
    aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-23
    jblack@gnuarch.org--2004/baz--lintchanges--1.1--base-0
    jblack@gnuarch.org--2004/baz--lintchanges--1.1--patch-1
    jblack@gnuarch.org--2004/baz--qualifiedrevision--1.1--base-0
    jblack@gnuarch.org--2004/baz--qualifiedrevision--1.1--patch-1
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-10
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-11
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-12
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-13
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-14
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-15
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-16
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-17
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-18
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-19
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-20
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-21
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-22
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-23
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-24
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-25
    rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-26
    rob.weir@canonical.com--2004-public/baz--bug3090--0--patch-9
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-13
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-14
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-15
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-16
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-17
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-18
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-19
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-20
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-21
    tez@kamihira.com--2004s/tla--devo-po--1.3--base-0
    tez@kamihira.com--2004s/tla--devo-po--1.3--patch-1
    tez@kamihira.com--2004s/tla--devo-po--1.3--patch-2
    thelove@canonical.com/bazaar--devo--1.1--patch-23
    thelove@canonical.com/bazaar--devo--1.1--patch-24
    thelove@canonical.com/bazaar--devo--1.1--patch-25
    thelove@canonical.com/bazaar--devo--1.1--patch-26
    thelove@canonical.com/bazaar--devo--1.1--patch-27
    thelove@canonical.com/bazaar--devo--1.1--patch-28
    thelove@canonical.com/bazaar--devo--1.1--patch-29
Summary: sync up with THELOVE.
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--base-0

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-1
   Ensured that tree versions for libraries are always right

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-2
   Added tree_latest_revision to patch-logs

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-3
   Moved star-merge -t to use the new arch_merge3

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-4
   Made interpret_delta_path into a cmdutils function

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-5
   Removed the useless --forward option from all relevent commands

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-6
   Added --three-way option to apply-delta

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-7
   removed references to star-merge from merge-three-way

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-8
   questionable changes to pull merge_from_changeset into merge-three-way

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-9
   Undid questionable changes

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-10
   split apply_changeset into apply_changeset and merge_from_changeset

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-11
   Fixed missing includes and unused functions

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-12
   Removed unused variable

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-13
   Refactored merge_from_changeset

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-14
   switched callbacks to one_path_callback and two_path_callback

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-15
   Output tweaks

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-16
   ~ -> =, show delete failures

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-17
   More incremental chatter

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-18
   Parameterized whether no-op merges are displayed

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-19
   Fixed spelling of "arch_nearest_star_ancester"

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-20
   Added no-op message for missing removed directories

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-21
   Delayed the no-op detection

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-22
   Fixed sort order for directory removal

 * aaron.bentley@utoronto.ca--baz/bazaar--three-way--0--patch-23
   Replay --skip-present of bazaar--devo--1.1

 * jblack@gnuarch.org--2004/baz--lintchanges--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-22

 * jblack@gnuarch.org--2004/baz--lintchanges--1.1--patch-1
   Now baz changes does a tree-lint

 * jblack@gnuarch.org--2004/baz--qualifiedrevision--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-23

 * jblack@gnuarch.org--2004/baz--qualifiedrevision--1.1--patch-1
   By default show qualified revisions

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-10
   only use newest inode sig when reading inode shortcuts in - fixes bug where incorrect signatures would be used (i.e. when multiple signatures existed as they do in a library entry

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-11
   create an inode_sig struct, and modify arch_tree_inode_sig to generate it; modify all callers appropriately

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-12
   pass inode_sig rather than rel_table to inode_sig_callback

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-13
   add paths field to inode_sig, factor out duplicate free calls that resulted into arch_inode_sig_free.

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-14
   rename newsig_rel to newsig in arch_snap_inode_sig_files to prevent confusion

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-15
   parameterise the file location logic in inode-sig.c to allow the paths info to be store separately, trivially

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-16
   create ,,inode-sig-paths as well as inode sig id maps

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-17
   use an inode_sig in arch_snap_inode_sig_files

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-18
   rename arch_read_inode_sig to arch_read_inode_sig_ids throughout

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-19
   generate inode path reading logic

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-20
   update inode paths on partial commits

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-21
   extract duplicate code to arch_write_inode_sig_file

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-22
   bugfix, forgot to gree newsig_paths

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-23
   extract arch_inode_sig_equal from arch_valid_inode_sig prior to adding path mapping to arch_valid_inode_sig

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-24
   remove unused variable warnings in inode-sig.c

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-25
   test inode paths changes in reference trees

 * rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2--patch-26
   reverse patch-5 for the new improved separate-file-for-paths-mapping approach

 * rob.weir@canonical.com--2004-public/baz--bug3090--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.0--patch-65

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-13
   merge from thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-14
   merge in tla inode sig integrity improvements from rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-15
   merge in aaron.bentley@utoronto.ca--baz/bazaar--three-way--0

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-16
   merge from thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-17
   make new-files header in import logs consistent with that in commit logs - bug #3589

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-18
   merge in Tez Kamihira's gettext work, tweaked to baz and for better modularity

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-19
   implement tree-id, a command to get the unique tree id in one step

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-20
   fix diff so that it works for patchlevels without having a default archive set

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-21
   add po/README with a real id

 * tez@kamihira.com--2004s/tla--devo-po--1.3--base-0
   tag of lord@emf.net--2004/tla--devo--1.3--patch-26

 * tez@kamihira.com--2004s/tla--devo-po--1.3--patch-1
   add setup function for gettext().

 * tez@kamihira.com--2004s/tla--devo-po--1.3--patch-2
   tagged strings in almost all of libarch/*.c

 * thelove@canonical.com/bazaar--devo--1.1--patch-23
   Now baz changes does a tree-lint

 * thelove@canonical.com/bazaar--devo--1.1--patch-24
   By default show qualified revisions

 * thelove@canonical.com/bazaar--devo--1.1--patch-25
   merge in tla inode sig integrity improvements from rbtcollins@hotmail.com--barch/tla--inode-sigs--1.2 - helps bug #3869

 * thelove@canonical.com/bazaar--devo--1.1--patch-26
   merge in aaron.bentley@utoronto.ca--baz/bazaar--three-way--0

 * thelove@canonical.com/bazaar--devo--1.1--patch-27
   make new-files header in import logs consistent with that in commit logs - bug #3589

 * thelove@canonical.com/bazaar--devo--1.1--patch-28
   merge in Tez Kamihira's gettext work, diff correctness & nuking of changes, and new command tree-id

 * thelove@canonical.com/bazaar--devo--1.1--patch-29
   revert lint UI change that regressed usability, and add po/README officially

